Merge.
authorsos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Thu, 26 Jan 2006 17:02:21 +0000 (18:02 +0100)
committersos22@douglas.cl.cam.ac.uk <sos22@douglas.cl.cam.ac.uk>
Thu, 26 Jan 2006 17:02:21 +0000 (18:02 +0100)
commit5df327098e07feac2e4c2e52026af19246775686
tree7a35b93636080f587f94819412b6fb455e7d3028
parentc8d0b4d1532edb92b642675227cc7e53cb5911a1
parent16f2e34d4f1e2172493c375a474397dec8025f87
Merge.

Signed-off-by: Steven Smith, sos22@cam.ac.uk
tools/libxc/xc_linux_build.c
xen/arch/x86/mm.c